diff --git a/Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c b/Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c
index 353627d658b6271803d9303b40521f9ad58cf782..a5cdf649e83f05e2c1861b1a60fd45a7e63a931b 100644
--- a/Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c
+++ b/Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c
@@ -75,7 +75,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
- 5000ul,
+ 500ul,
0x37Bul,
(( void * )0),
(( void * )0),
diff --git a/Firmware/Source/Component/AMT630H/AMT630H_Datas.c b/Firmware/Source/Component/AMT630H/AMT630H_Datas.c
index 44d31ecfa7685897ebc6b13eecd24c435800532a..23547145dfb97ffc7f3974727fb0551374fa6501 100644
--- a/Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+++ b/Firmware/Source/Component/AMT630H/AMT630H_Datas.c
@@ -1137,13 +1137,56 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_TENB_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Hour_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_455_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Hour_Bit_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_525_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Min_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
- break;
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_572_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Min_Bit_Set(MENU_KEY_CONFIRM_SHORT);
default:
break;
}
@@ -1196,13 +1239,56 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_TENB_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Hour_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_455_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Hour_Bit_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_525_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Min_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
- break;
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_572_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Min_Bit_Set(MENU_KEY_CONFIRM_SHORT);
default:
break;
}
@@ -1229,13 +1315,56 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
SetPagePic(GRAPHICS_PAGE_0, Pic_0018_441_335);/*cursor*/
break;
case MENU_ITEM_CLOCK_HOUR_TENB_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0020_408_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Hour_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_HOUR_BIT_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_455_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Hour_Bit_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_MIN_TENB_SET:
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_525_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Min_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
break;
case MENU_ITEM_CLOCK_MIN_BIT_SET:
- break;
+ /*Cursor blinking*/
+ if(FLASH_SYNC_1Hz)
+ {
+ SetPagePic(GRAPHICS_PAGE_0,Pic_0020_572_209);
+ }
+ else
+ {
+ ;
+ }
+ /*Digital changes*/
+ Menu_Logic_Operation_Clock_Min_Bit_Set(MENU_KEY_CONFIRM_SHORT);
default:
break;
}
@@ -1262,213 +1391,6 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Clock_MinNumber);
}
-
- // /*日间ä¸æ–‡*/
- // if (Pic_mode == PIC_DAYTIME_CH)
- // {
- // SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);
- // SetPagePic(GRAPHICS_PAGE_0, Pic_0135_27_396);
- // 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;
- // }
-
- // 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 = 455;
- // 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 = 572;
- // 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_0323_27_396);
- // SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);
- // 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 = 455;
- // 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 = 572;
- // 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_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);
- // }
}
/**
@@ -2057,15 +1979,15 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
SetPagePic(GRAPHICS_PAGE_0, Pic_0056_377_166);
switch (select)
{
- case 0:
+ case MENU_ITEM_BLUETOOTH_OPEN_CLOSE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_205);/*è“牙连接 å…‰æ ‡*/
break;
- case 1:
+ case MENU_ITEM_BLUETOOTH_SYNC:
SetPagePic(GRAPHICS_PAGE_0, Pic_0036_336_266);/*åŒæ¥è”系人 å…‰æ ‡*/
break;
- case 2:
+ case MENU_ITEM_BLUETOOTH_BACK:
SetPagePic(GRAPHICS_PAGE_0, Pic_0035_336_324);/*返回 å…‰æ ‡*/
break;
default:
@@ -2121,13 +2043,13 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
SetPagePic(GRAPHICS_PAGE_0, Pic_0330_367_163);
switch (select)
{
- case 0:
+ case MENU_ITEM_BLUETOOTH_OPEN_CLOSE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_205);/*è“牙连接 å…‰æ ‡*/
break;
- case 1:
+ case MENU_ITEM_BLUETOOTH_SYNC:
SetPagePic(GRAPHICS_PAGE_0, Pic_0036_336_266);/*åŒæ¥è”系人 å…‰æ ‡*/
break;
- case 2:
+ case MENU_ITEM_BLUETOOTH_BACK:
SetPagePic(GRAPHICS_PAGE_0, Pic_0035_336_324);/*返回 å…‰æ ‡*/
break;
default:
@@ -2150,7 +2072,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
sync_contactsNumber = sync_contacts;
if (sync_contacts < 10)
{
- SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287);
DisplayNumPara.NumList = Bluetooth_Connect_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 604;
@@ -2161,7 +2083,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
}
else
{
- SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287);
DisplayNumPara.NumList = Bluetooth_Connect_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.x = 612;
@@ -2181,14 +2103,14 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
SetPagePic(GRAPHICS_PAGE_0, Pic_0242_377_166);
switch (select)
{
- case 0:
+ case MENU_ITEM_BLUETOOTH_OPEN_CLOSE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_205);/*è“牙连接 å…‰æ ‡*/
break;
- case 1:
+ case MENU_ITEM_BLUETOOTH_SYNC:
SetPagePic(GRAPHICS_PAGE_0, Pic_0036_336_266);/*åŒæ¥è”系人 å…‰æ ‡*/
break;
- case 2:
+ case MENU_ITEM_BLUETOOTH_BACK:
SetPagePic(GRAPHICS_PAGE_0, Pic_0035_336_324);/*返回 å…‰æ ‡*/
break;
default:
@@ -2519,29 +2441,43 @@ void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select) /*图 è¯è¨€è®¾ç½®
*/
void AMT630H_GUI_Phone_Connect_Win(void)
{
- if (Pic_mode == PIC_DAYTIME_CH)
- {
- SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0127_27_396);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0128_429_152);
- }
- else if (Pic_mode == PIC_NIGHTTIME_CH)
- {
- SetPagePic(GRAPHICS_PAGE_0, Pic_0315_27_396);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0316_429_152);
- }
- else if (Pic_mode == PIC_DAYTIME_EN)
+ if(g_u8Display_Mode == ModeDAY)
{
- SetPagePic(GRAPHICS_PAGE_0, Pic_0003_23_397);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0005_304_155);
+ if(g_u8Language == CH)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0127_27_396);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0128_429_152);
+ }
+ else if(g_u8Language == EN)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0003_23_397);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0005_304_155);
+ }
+ else
+ {
+ ;
+ }
}
- else if (Pic_mode == PIC_NIGHTTIME_EN)
+ else if(g_u8Display_Mode == ModeNIGHT)
{
- SetPagePic(GRAPHICS_PAGE_0, Pic_0194_23_397);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0195_304_155);
+ if(g_u8Language == CH)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0315_27_396);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0316_429_152);
+ }
+ else if(g_u8Language == EN)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0194_23_397);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0195_304_155);
+ }
+ else
+ {
+ ;
+ }
}
}
@@ -3444,7 +3380,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
else if((Tripnumber<1000)&&(Tripnumber>=100))
{
DisplayNumPara.x = 101;
- DisplayNumPara.MinDigits = 4;
+ DisplayNumPara.MinDigits = 3;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
@@ -3457,7 +3393,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
else if((Tripnumber<100)&&(Tripnumber>=10))
{
DisplayNumPara.x = 77;
- DisplayNumPara.MinDigits = 4;
+ DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_115_324);/*KM*/
@@ -3470,7 +3406,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
else if((Tripnumber<10)&&(Tripnumber>=0))
{
DisplayNumPara.x = 53;
- DisplayNumPara.MinDigits = 4;
+ DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_91_324);/*å•ä½KM*/
@@ -3506,14 +3442,14 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
else if((Tripnumber<1000)&&(Tripnumber>=100))
{
DisplayNumPara.x = 101;
- DisplayNumPara.MinDigits = 4;
+ DisplayNumPara.MinDigits = 3;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*å•ä½mile*/
}
else if((Tripnumber<100)&&(Tripnumber>=10))
{
DisplayNumPara.x = 77;
- DisplayNumPara.MinDigits = 4;
+ DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_115_324);/*KM*/
@@ -3526,7 +3462,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
else if((Tripnumber<10)&&(Tripnumber>=0))
{
DisplayNumPara.x = 53;
- DisplayNumPara.MinDigits = 4;
+ DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_91_324);/*å•ä½KM*/
@@ -3541,12 +3477,19 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
}
/*车速显示函数*/
-static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
+static void AMT630H_GUI_VSpeed(uint16_t VSpeed,uint8_t Unit)
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0592_617_271);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);
+ if(Unit == 0)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);/*å•ä½ km/h */
+ }
+ else
+ {
+ ;/*å•ä½ mile/h */
+ }
/*æ•°æ®å¤„ç†*/
DISPLAY_NUM_ST DisplayNumPara;
@@ -3598,7 +3541,14 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0700_617_271);
- SetPagePic(GRAPHICS_PAGE_0, Pic_0701_889_310);
+ if(Unit == 0)
+ {
+ SetPagePic(GRAPHICS_PAGE_0, Pic_0701_889_310);/*å•ä½ km/h */
+ }
+ else
+ {
+ ;/*å•ä½ mile/h */
+ }
/*æ•°æ®å¤„ç†*/
DISPLAY_NUM_ST DisplayNumPara;
@@ -3800,7 +3750,14 @@ void AMT630H_GUI_BACKGRAND()
}
AMT630H_GUI_Voltage(KL30_VOLTAGE_Value);
- AMT630H_GUI_ODO(Get_ODO_Value() / 10, 0);
+ if(Get_Dis_OdoAndTrip() == 0)
+ {
+ AMT630H_GUI_ODO(Get_ODO_Value() / 10, Get_Dis_Unit());
+ }
+ else
+ {
+ AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit());
+ }
if(VechileSpeed_time < 4)
{
VechileSpeed_time++;
@@ -3813,11 +3770,11 @@ void AMT630H_GUI_BACKGRAND()
}
if (Get_VechileSpeedValid() == 1)
{
- AMT630H_GUI_VSpeed(VechileSpeed);
+ AMT630H_GUI_VSpeed(Get_DispVechileSpeed() / 10, Get_Dis_Unit());
}
else
{
- AMT630H_GUI_VSpeed(0);
+ AMT630H_GUI_VSpeed(0,0);
}
/*转速*/
if (Get_EngineValid() == 1)
@@ -3907,7 +3864,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
/*车速自检*/
if(g_u16vspeednumberup < 600)
{
- AMT630H_GUI_VSpeed(g_u16vspeednumberup/3);/*åˆå§‹åŒ–g_u16vspeednumberup = 0*/
+ AMT630H_GUI_VSpeed(g_u16vspeednumberup/3,Get_Dis_Unit());/*åˆå§‹åŒ–g_u16vspeednumberup = 0*/
g_u16vspeednumberup+=6;
}
else
@@ -3915,7 +3872,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
if(g_u16vspeednumberdown >0)
{
g_u16vspeednumberdown-=6;/*åˆå§‹åŒ–g_u16vspeednumberup=1200*/
- AMT630H_GUI_VSpeed(g_u16vspeednumberdown/3);/*if g_u16vspeednumberup=0 车速自检结æŸ*/
+ AMT630H_GUI_VSpeed(g_u16vspeednumberdown/3,Get_Dis_Unit());/*if g_u16vspeednumberup=0 车速自检结æŸ*/
}
else
{
@@ -3943,7 +3900,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
}
if(g_u16vspeednumberdown == 0)
{
- AMT630H_GUI_VSpeed(g_u16vspeednumberdown);
+ AMT630H_GUI_VSpeed(g_u16vspeednumberdown, Get_Dis_Unit());
}
if(g_u16espeednumberdown == 0)
{