Skip to content

H
haoJin750TFT
Commit 3ad5d370 authored by 王雅楠's avatar 王雅楠
Browse files
Options

🐞 fix:修改时钟设置的一级菜单和二级菜单（二级菜单中修改时钟数字功能暂未完成）

parent c2e147df
Hide whitespace changes
Inline Side-by-side
Showing with 431 additions and 291 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 3ad5d370
...@@ -588,141 +588,74 @@ static uint16_t Time_num_night[] = { ...@@ -588,141 +588,74 @@ static uint16_t Time_num_night[] = {
*/ */
void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min) void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min)
{ {
// /*日间中文*/ DISPLAY_NUM_ST DisplayNumPara;
// if (Pic_mode == PIC_DAYTIME_CH) uint8_t Clock_HourNumber;
// { uint8_t Clock_MinNumber;
// SetPagePic(GRAPHICS_PAGE_0, Pic_0179_27_396); Clock_HourNumber = Clock_Hour;
// SetPagePic(GRAPHICS_PAGE_0, Pic_0180_903_396); Clock_MinNumber = Clock_Min;
// SetPagePic(GRAPHICS_PAGE_0, Pic_0181_197_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0173_737_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0182_446_517);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
// /*夜间中文*/
// else if (Pic_mode == PIC_NIGHTTIME_CH)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0366_27_396);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0367_903_396);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0368_197_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0360_737_485);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0369_446_517);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
// /*日间英文*/
// else if (Pic_mode == PIC_DAYTIME_EN)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0108_19_397);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0109_899_399);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0110_192_486);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0111_758_487);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0112_429_519);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
// DISPLAY_NUM_ST DisplayNumPara; if(g_u8Display_Mode == ModeDAY)
// uint8_t Clock_HourNumber; {
// uint8_t Clock_MinNumber; if(g_u8Language == CH)
// Clock_HourNumber = Clock_Hour; {
// Clock_MinNumber = Clock_Min; SetPagePic(GRAPHICS_PAGE_0, Pic_0135_27_396);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338);/*返回*/
// DisplayNumPara.NumList = Time_num_day; SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);/* ： */
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; }
// DisplayNumPara.x = 457; else if(g_u8Language == EN)
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; {
// DisplayNumPara.DecimalNum = 0; SetPagePic(GRAPHICS_PAGE_0, Pic_0017_19_397);/*下方菜单*/
// DisplayNumPara.MinDigits = 2; SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);/*返回*/
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber); SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);/* ： */
}
// DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.x = 574; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; DisplayNumPara.x = 457;
// DisplayNumPara.DecimalNum = 0; DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.MinDigits = 2; DisplayNumPara.DecimalNum = 0;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber); DisplayNumPara.MinDigits = 2;
// } DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// /*夜间英文*/
// else if (Pic_mode == PIC_NIGHTTIME_EN)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0296_19_397);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0297_899_399);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0298_192_486);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0299_758_487);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0300_429_519);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = Time_num_night; DisplayNumPara.NumList = Time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457; DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0; DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0323_27_396);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);/*返回*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);/* ： */
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0206_19_397);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);/*返回*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);/* ： */
}
DisplayNumPara.NumList = Time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 457;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = Time_num_night; DisplayNumPara.NumList = Time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574; DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0; DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// } }
} }
/** /**
...@@ -964,41 +897,91 @@ static uint16_t time_num_night[] = { ...@@ -964,41 +897,91 @@ static uint16_t time_num_night[] = {
*/ */
static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uint8_t Clock_BIT) static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uint8_t Clock_BIT)
{ {
if(g_u8Display_Mode == ModeDAY)
/*日间中文*/
if (Pic_mode == PIC_DAYTIME_CH)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222); SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);/* ： */
SetPagePic(GRAPHICS_PAGE_0, Pic_0135_27_396); if(g_u8Language == CH)
SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338); {
SetPagePic(GRAPHICS_PAGE_0, Pic_0135_27_396);/*下方菜单*/
switch (Clock_BIT) SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338);/*key 返回*/
{ switch (Clock_BIT)
case 1: {
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位 case MENU_ITEM_CLOCK_HOUR_TENB:
break; SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);/*cursor*/
case 2: break;
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位 case MENU_ITEM_CLOCK_HOUR_BIT:
break; SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209);/*cursor*/
case 3: break;
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位 case MENU_ITEM_CLOCK_MIN_TENB:
break; SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209);/*cursor*/
case 4: break;
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位 case MENU_ITEM_CLOCK_MIN_BIT:
break; SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209);/*cursor*/
case 5: break;
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335); // 返回 case MENU_ITEM_CLOCK_BACK:
break; SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
default: break;
break; case MENU_ITEM_CLOCK_HOUR_TENB_SET:
/*Cursor blinking*/
/*Digital changes*/ //Sava picked data and
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
/*Cursor blinking*/
/*Digital changes*/
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
/*Cursor blinking*/
/*Digital changes*/
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
/*Cursor blinking*/
/*Digital changes*/
break;
default:
break;
}
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0017_19_397);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);/*return*/
switch (Clock_BIT)
{
case MENU_ITEM_CLOCK_HOUR_TENB:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_BIT:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_MIN_TENB:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_MIN_BIT:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_BACK:
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_TENB_SET:
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
break;
default:
break;
}
} }
/*display time*/
DISPLAY_NUM_ST DisplayNumPara; DISPLAY_NUM_ST DisplayNumPara;
uint8_t Clock_HourNumber; uint8_t Clock_HourNumber;
uint8_t Clock_MinNumber; uint8_t Clock_MinNumber;
Clock_HourNumber = Clock_Hour; Clock_HourNumber = Clock_Hour;
Clock_MinNumber = Clock_Min; Clock_MinNumber = Clock_Min;
/*Data processing*/
DisplayNumPara.NumList = time_num_day; DisplayNumPara.NumList = time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 455; DisplayNumPara.x = 455;
...@@ -1006,7 +989,6 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin ...@@ -1006,7 +989,6 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
DisplayNumPara.DecimalNum = 0; DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = time_num_day; DisplayNumPara.NumList = time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 572; DisplayNumPara.x = 572;
...@@ -1015,40 +997,82 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin ...@@ -1015,40 +997,82 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
} }
else if(g_u8Display_Mode == ModeNIGHT)
/*夜间中文*/
else if (Pic_mode == PIC_NIGHTTIME_CH)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0323_27_396); SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);/* ： */
SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338); if(g_u8Language == CH)
SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222); {
switch (Clock_BIT) SetPagePic(GRAPHICS_PAGE_0, Pic_0323_27_396);/*下方菜单*/
{ SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);/*return*/
case 1: switch (Clock_BIT)
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位 {
break; case MENU_ITEM_CLOCK_HOUR_TENB:
case 2: SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);/*cursor*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位 break;
break; case MENU_ITEM_CLOCK_HOUR_BIT:
case 3: SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209);/*cursor*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位 break;
break; case MENU_ITEM_CLOCK_MIN_TENB:
case 4: SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209);/*cursor*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位 break;
break; case MENU_ITEM_CLOCK_MIN_BIT:
case 5: SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209);/*cursor*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0207_437_316); // 返回 break;
break; case MENU_ITEM_CLOCK_BACK:
default: SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
break; break;
case MENU_ITEM_CLOCK_HOUR_TENB_SET:
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
break;
default:
break;
}
} }
/*数据处理*/ else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0206_19_397);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);/*return*/
switch (Clock_BIT)
{
case MENU_ITEM_CLOCK_HOUR_TENB:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_BIT:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_MIN_TENB:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_MIN_BIT:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209);/*cursor*/
break;
case MENU_ITEM_CLOCK_BACK:
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_TENB_SET:
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
break;
default:
break;
}
}
/*display time*/
DISPLAY_NUM_ST DisplayNumPara; DISPLAY_NUM_ST DisplayNumPara;
uint8_t Clock_HourNumber; uint8_t Clock_HourNumber;
uint8_t Clock_MinNumber; uint8_t Clock_MinNumber;
Clock_HourNumber = Clock_Hour; Clock_HourNumber = Clock_Hour;
Clock_MinNumber = Clock_Min; Clock_MinNumber = Clock_Min;
/*data processing*/
DisplayNumPara.NumList = time_num_night; DisplayNumPara.NumList = time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 455; DisplayNumPara.x = 455;
...@@ -1056,7 +1080,6 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin ...@@ -1056,7 +1080,6 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
DisplayNumPara.DecimalNum = 0; DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = time_num_night; DisplayNumPara.NumList = time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 572; DisplayNumPara.x = 572;
...@@ -1066,111 +1089,212 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin ...@@ -1066,111 +1089,212 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
} }
/*日间英文*/ // /*日间中文*/
else if (Pic_mode == PIC_DAYTIME_EN) // if (Pic_mode == PIC_DAYTIME_CH)
{ // {
SetPagePic(GRAPHICS_PAGE_0, Pic_0017_19_397); // SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341); // SetPagePic(GRAPHICS_PAGE_0, Pic_0135_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222); // SetPagePic(GRAPHICS_PAGE_0, Pic_0136_489_338);
/*光标*/
switch (Clock_BIT)
{
case 1:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位
break;
case 2:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位
break;
case 3:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位
break;
case 4:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位
break;
case 5:
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335); // 返回
break;
default:
break;
}
/*数据处理*/ // switch (Clock_BIT)
DISPLAY_NUM_ST DisplayNumPara; // {
uint8_t Clock_HourNumber; // case 1:
uint8_t Clock_MinNumber; // SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位
Clock_HourNumber = Clock_Hour; // break;
Clock_MinNumber = Clock_Min; // case 2:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位
// break;
// case 3:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位
// break;
// case 4:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位
// break;
// case 5:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335); // 返回
// break;
// default:
// break;
// }
DisplayNumPara.NumList = time_num_day; // DISPLAY_NUM_ST DisplayNumPara;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; // uint8_t Clock_HourNumber;
DisplayNumPara.x = 457; // uint8_t Clock_MinNumber;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; // Clock_HourNumber = Clock_Hour;
DisplayNumPara.DecimalNum = 0; // Clock_MinNumber = Clock_Min;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = time_num_day; // DisplayNumPara.NumList = time_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; // DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 574; // DisplayNumPara.x = 455;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; // DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0; // DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2; // DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber); // DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
}
/*夜间英文*/ // DisplayNumPara.NumList = time_num_day;
else if (Pic_mode == PIC_NIGHTTIME_EN) // DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
{ // DisplayNumPara.x = 572;
SetPagePic(GRAPHICS_PAGE_0, Pic_0206_19_397); // DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341); // DisplayNumPara.DecimalNum = 0;
SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222); // DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
/*光标*/ // }
switch (Clock_BIT)
{
case 1:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位
break;
case 2:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位
break;
case 3:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位
break;
case 4:
SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位
break;
case 5:
SetPagePic(GRAPHICS_PAGE_0, Pic_0207_437_316); // 返回
break;
default:
break;
}
/*数据处理*/ // /*夜间中文*/
DISPLAY_NUM_ST DisplayNumPara; // else if (Pic_mode == PIC_NIGHTTIME_CH)
uint8_t Clock_HourNumber; // {
uint8_t Clock_MinNumber; // SetPagePic(GRAPHICS_PAGE_0, Pic_0323_27_396);
Clock_HourNumber = Clock_Hour; // SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);
Clock_MinNumber = Clock_Min; // SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
// switch (Clock_BIT)
// {
// case 1:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位
// break;
// case 2:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位
// break;
// case 3:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位
// break;
// case 4:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位
// break;
// case 5:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0207_437_316); // 返回
// break;
// default:
// break;
// }
// /*数据处理*/
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
DisplayNumPara.NumList = time_num_night; // DisplayNumPara.NumList = time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; // DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 457; // DisplayNumPara.x = 455;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; // DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0; // DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2; // DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber); // DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
DisplayNumPara.NumList = time_num_night; // DisplayNumPara.NumList = time_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47; // DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
DisplayNumPara.x = 574; // DisplayNumPara.x = 572;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; // DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0; // DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2; // DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber); // DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
} // }
// /*日间英文*/
// else if (Pic_mode == PIC_DAYTIME_EN)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0017_19_397);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
// /*光标*/
// switch (Clock_BIT)
// {
// case 1:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位
// break;
// case 2:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位
// break;
// case 3:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位
// break;
// case 4:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位
// break;
// case 5:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335); // 返回
// break;
// default:
// break;
// }
// /*数据处理*/
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = time_num_day;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
// /*夜间英文*/
// else if (Pic_mode == PIC_NIGHTTIME_EN)
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0206_19_397);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);
// /*光标*/
// switch (Clock_BIT)
// {
// case 1:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209); // 小时第一位
// break;
// case 2:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_455_209); // 小时第二位
// break;
// case 3:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_525_209); // 分钟第一位
// break;
// case 4:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0020_572_209); // 分钟第二位
// break;
// case 5:
// SetPagePic(GRAPHICS_PAGE_0, Pic_0207_437_316); // 返回
// break;
// default:
// break;
// }
// /*数据处理*/
// DISPLAY_NUM_ST DisplayNumPara;
// uint8_t Clock_HourNumber;
// uint8_t Clock_MinNumber;
// Clock_HourNumber = Clock_Hour;
// Clock_MinNumber = Clock_Min;
// DisplayNumPara.NumList = time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 457;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_HourNumber);
// DisplayNumPara.NumList = time_num_night;
// DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 47;
// DisplayNumPara.x = 574;
// DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
// DisplayNumPara.DecimalNum = 0;
// DisplayNumPara.MinDigits = 2;
// DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
// }
} }
/** /**
...@@ -3160,13 +3284,13 @@ void AMT630H_GUI_SETTING() ...@@ -3160,13 +3284,13 @@ void AMT630H_GUI_SETTING()
{ {
if(g_u8Language == CH) if(g_u8Language == CH)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*修改为PNG格式*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0002_0_0);
SetPagePic(GRAPHICS_PAGE_0, Pic_0380_396_528); SetPagePic(GRAPHICS_PAGE_0, Pic_0380_396_528);
SetPagePic(GRAPHICS_PAGE_0, Pic_0381_615_528); SetPagePic(GRAPHICS_PAGE_0, Pic_0381_615_528);
} }
else if(g_u8Language == EN) else if(g_u8Language == EN)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*修改为PNG格式*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0002_0_0);
SetPagePic(GRAPHICS_PAGE_0, Pic_0380_396_528); SetPagePic(GRAPHICS_PAGE_0, Pic_0380_396_528);
SetPagePic(GRAPHICS_PAGE_0, Pic_0381_615_528); SetPagePic(GRAPHICS_PAGE_0, Pic_0381_615_528);
} }
...@@ -3290,15 +3414,31 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -3290,15 +3414,31 @@ void AMT630H_GUI_ReadPosittion_Display(void)
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_BACK); AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_BACK);
break; break;
case MENU_ITEM_UNIT_SETTING: /*21 单位设置*/ case MENU_ITEM_CLOCK_HOUR_TENB_SET:/*27 时钟小时十位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_HOUR_TENB_SET);
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:/*28 时钟小时个位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_HOUR_BIT_SET);
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:/*29 时钟分钟十位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_MIN_TENB_SET);
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:/*30 时钟分钟个位*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Clock_Setting(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), MENU_ITEM_CLOCK_MIN_BIT_SET);
break;
case MENU_ITEM_UNIT_SETTING: /*05 单位设置*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Unit_Information(); AMT630H_GUI_Unit_Information();
break; break;
case MENU_ITEM_UNIT_KM: /*22 选中公制*/ case MENU_ITEM_UNIT_KM: /*31 选中公制*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Unit_Setting(MENU_ITEM_UNIT_KM); AMT630H_GUI_Unit_Setting(MENU_ITEM_UNIT_KM);
break; break;
case MENU_ITEM_UNIT_MILE: /*23 选中英制*/ case MENU_ITEM_UNIT_MILE: /*32 选中英制*/
AMT630H_GUI_SETTING(); AMT630H_GUI_SETTING();
AMT630H_GUI_Unit_Setting(MENU_ITEM_UNIT_MILE); AMT630H_GUI_Unit_Setting(MENU_ITEM_UNIT_MILE);
break; break;
......
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