Skip to content

H
haoJin750TFT
Commit c12bd090 authored by 张金硕's avatar 张金硕
Browse files
Options

Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into jinshuo

parents 46d93aed 8e64608e
Show whitespace changes
Inline Side-by-side
Showing with 225 additions and 265 deletions
Firmware/Source/Application/BlueTooth.c
View file @ c12bd090
...@@ -255,8 +255,8 @@ void TextService(void) ...@@ -255,8 +255,8 @@ void TextService(void)
} }
} }
} }
if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_BLUETOOTH_CONNECT) // if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_BLUETOOTH_CONNECT)
{ // {
if (memcmp(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)) != 0) if (memcmp(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)) != 0)
{ {
for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.BlueToothName); i++) for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.BlueToothName); i++)
...@@ -267,7 +267,7 @@ void TextService(void) ...@@ -267,7 +267,7 @@ void TextService(void)
memcpy(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)); memcpy(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName));
TextPara[TEXT_NUM_BLUETOOTH_NAME].Vaild = 0X01; TextPara[TEXT_NUM_BLUETOOTH_NAME].Vaild = 0X01;
} }
} // }
if (LastPhoneBookTotalCount != BlueToothPhoneData.PhoneBookTotalCount) if (LastPhoneBookTotalCount != BlueToothPhoneData.PhoneBookTotalCount)
{ {
uint8_t TempNumberCnts = 0; uint8_t TempNumberCnts = 0;
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ c12bd090
...@@ -118,7 +118,7 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -118,7 +118,7 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0097_334_163);/*current fault*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0097_334_163);/*current fault*/
AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode()); AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode());
} }
/*蓝牙名称改为字库显示*/ /*os MCU版本*/
/* RGB 0 0 0 --- 黑*/ /* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/ /* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20); PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
...@@ -162,7 +162,7 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -162,7 +162,7 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);/*current fault*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);/*current fault*/
AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode()); AMT630H_GUI_FaultCode(Get_FaultCode_Lost(),Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode());
} }
/*蓝牙名称改为字库显示*/ /*os MCU版本*/
/* RGB 0 0 0 --- 黑*/ /* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/ /* RGB 0XFF 0XFF 0XFF --- 白*/
PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20); PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
...@@ -170,7 +170,6 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -170,7 +170,6 @@ void AMT630H_GUI_Fault_Information(void)
PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26); PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26);
SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -203,160 +202,29 @@ uint8_t FaultCodevalid_monitor = 2; ...@@ -203,160 +202,29 @@ uint8_t FaultCodevalid_monitor = 2;
/*故障码显示函数*/ /*故障码显示函数*/
static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost,uint8_t FaultCodevalid,uint8_t FaultCode_hight,uint8_t FaultCode_mid) static void AMT630H_GUI_FaultCode(uint8_t FaultCodeLost,uint8_t FaultCodevalid,uint8_t FaultCode_hight,uint8_t FaultCode_mid)
{ {
/*数字只有两组 历史故障和故障信息纵坐标不同*/
FaultCodevalid_monitor = FaultCodevalid;
if(FaultCodeLost == 1) if(FaultCodeLost == 1)
{ {
if(FaultCodevalid > 0) if(FaultCodevalid == 1)
{ {
DISPLAY_NUM_ST DisplayNumPara;
uint16_t frontnumber;
uint16_t midnumber;
frontnumber = FaultCode_hight;
midnumber = FaultCode_mid;
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P /*当前故障*/
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
/*当前故障码前两位显示*/ SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 229 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.NumList = NumbeList_FaultCode_day; /*历史故障*/
DisplayNumPara.x = 639; PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 164 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*当前故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
/*历史故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*历史故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 164);//当前故障码的P /*当前故障*/
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 229);//历史故障码的P PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
/*当前故障码前两位显示*/ SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 229 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.NumList = NumbeList_FaultCode_night; /*历史故障*/
DisplayNumPara.x = 639; PackedTransfer_LabelsList( 0x6009,(uint8_t *)TextFaultCodeNum, 10);
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; SetPageText(GRAPHICS_PAGE_0, 0x6009, 610 , 164 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*当前故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
/*历史故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, frontnumber);
/*历史故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
} }
} }
else if(FaultCodevalid == 0)
{
/*显示P0000*/
if(g_u8Display_Mode == ModeDAY)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P
DISPLAY_NUM_ST DisplayNumPara;
/*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
/*当前故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 164;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
/*历史故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
/*历史故障码后两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 667;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = 229;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, 0);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
/*显示P0000(直接贴图方式)*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_625_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_639_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_653_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_667_164);
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_625_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_639_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_653_229);
SetPagePic(GRAPHICS_PAGE_0, Pic_0901_667_229);
}
else
{
;
}
}
else
{
;
}
} }
else if(FaultCodeLost == 0) else if(FaultCodeLost == 0)
{ {
...@@ -671,7 +539,11 @@ static uint16_t Bluetooth_num_night[] = { ...@@ -671,7 +539,11 @@ static uint16_t Bluetooth_num_night[] = {
void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON) void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
{ {
uint8_t Contect_totalnumber; uint8_t Contect_totalnumber;
DISPLAY_NUM_ST DisplayNumPara;
uint16_t connect_personnumber;
connect_personnumber = BlueToothPhoneData.PhoneBookTotalCount;
Contect_totalnumber = 0; Contect_totalnumber = 0;
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
if(g_u8Language == CH) if(g_u8Language == CH)
...@@ -762,67 +634,74 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON) ...@@ -762,67 +634,74 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40); PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
/*遍历同步联系人数组*/ if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
if(PhoneNumberTotal[0] == 0)
{
Contect_totalnumber = 1;
}
else
{
for(int i=0 ; i<20 ; i++ )
{
if(PhoneNumberTotal[i] != 0)
{
Contect_totalnumber++;
}
else
{ {
break; /*同步联系人数字显示*/
}
}
}
/*同步联系人数字显示（字库版）*/
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
if(Contect_totalnumber == 1) if((connect_personnumber >= 0)&&(connect_personnumber < 10))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 605;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 1;
} }
else if(Contect_totalnumber == 2) else if((connect_personnumber >= 10)&&(connect_personnumber < 100))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 612;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 2;
}
else
{
;
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ // SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
// PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40); //
// SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
// } // }
DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, connect_personnumber);
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
if(Contect_totalnumber == 1) if((connect_personnumber >= 0)&&(connect_personnumber < 10))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 605;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 1;
} }
else if(Contect_totalnumber == 2) else if((connect_personnumber >= 10)&&(connect_personnumber < 100))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 612;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 2;
}
else
{
;
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ // SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ /* 同步联系人最大位数未确定*/
// PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40); //
// SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
// } // }
DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, connect_personnumber);
}
}
else/*蓝牙未连接或蓝牙关闭时 同步联系人显示0*/
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287);
SetPagePic(GRAPHICS_PAGE_0, Pic_0225_605_289);
} }
} }
...@@ -2113,6 +1992,9 @@ static uint16_t Bluetooth_Connect_num_night[] = { ...@@ -2113,6 +1992,9 @@ static uint16_t Bluetooth_Connect_num_night[] = {
*/ */
void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connect_ON) void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connect_ON)
{ {
DISPLAY_NUM_ST DisplayNumPara;
uint16_t connect_personnumber;
connect_personnumber = BlueToothPhoneData.PhoneBookTotalCount;
uint8_t Contect_totalnumber; uint8_t Contect_totalnumber;
Contect_totalnumber = 0; Contect_totalnumber = 0;
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
...@@ -2263,67 +2145,64 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec ...@@ -2263,67 +2145,64 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40); PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
/*遍历同步联系人数组*/
if(PhoneNumberTotal[0] == 0) /*同步联系人数字显示*/
{
Contect_totalnumber = 1;
}
else
{
for(int i=0 ; i<20 ; i++ )
{
if(PhoneNumberTotal[i] != 0)
{
Contect_totalnumber++;
}
else
{
break;
}
}
}
/*同步联系人数字显示（字库版）*/
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
if(Contect_totalnumber == 1) if((connect_personnumber >= 0)&&(connect_personnumber < 10))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 605;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 1;
} }
else if(Contect_totalnumber == 2) else if((connect_personnumber >= 10)&&(connect_personnumber < 100))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 612;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 2;
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ // SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
// PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40); //
// SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
// } // }
DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, connect_personnumber);
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
if(Contect_totalnumber == 1) if((connect_personnumber >= 0)&&(connect_personnumber < 10))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 605;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 1;
} }
else if(Contect_totalnumber == 2) else if((connect_personnumber >= 10)&&(connect_personnumber < 100))
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7000,(uint8_t *)PhoneNumberTotal, 20); DisplayNumPara.x = 612;
SetPageText(GRAPHICS_PAGE_0, 0x7000, 590 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); DisplayNumPara.MinDigits = 2;
}
else
{
;
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ // SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
// PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumberTotal, 40); //
// SetPageText(GRAPHICS_PAGE_0, 0x4022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
// } // }
DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, connect_personnumber);
} }
} }
...@@ -2852,7 +2731,7 @@ static const uint16_t NumbeList_PhoneConnect_ESpeed[] ={ ...@@ -2852,7 +2731,7 @@ static const uint16_t NumbeList_PhoneConnect_ESpeed[] ={
Pic_0394_64_554, Pic_0394_64_554,
}; };
static const uint16_t PICList_Fuel[] = { static const uint16_t PICList_Fuel[] = {
Pic_0562_315_473, Pic_0554_315_473,
Pic_0555_366_473, Pic_0555_366_473,
Pic_0556_426_473, Pic_0556_426_473,
Pic_0557_469_473, Pic_0557_469_473,
...@@ -2862,7 +2741,7 @@ static const uint16_t PICList_Fuel[] = { ...@@ -2862,7 +2741,7 @@ static const uint16_t PICList_Fuel[] = {
Pic_0561_623_473, Pic_0561_623_473,
}; };
static const uint16_t PICList_PhoneConnect_Fuel[] = { static const uint16_t PICList_PhoneConnect_Fuel[] = {
Pic_0414_76_536, Pic_0415_76_536,
Pic_0416_105_536, Pic_0416_105_536,
Pic_0417_134_536, Pic_0417_134_536,
Pic_0418_163_536, Pic_0418_163_536,
...@@ -3019,6 +2898,14 @@ static void AMT630H_GUI_PhoneConnect_Light() ...@@ -3019,6 +2898,14 @@ static void AMT630H_GUI_PhoneConnect_Light()
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0468_819_486); SetPagePic(GRAPHICS_PAGE_0, Pic_0468_819_486);
} }
if(Get_TelltalesLedSts(em_LED_Coolant_Temperature))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0436_981_528);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0435_981_528);
}
} }
/* /*
*NAME : AMT630H_GUI_TIME() *NAME : AMT630H_GUI_TIME()
...@@ -3144,8 +3031,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3144,8 +3031,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
...@@ -3157,8 +3044,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3157,8 +3044,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -3175,8 +3062,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3175,8 +3062,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
...@@ -3188,8 +3075,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3188,8 +3075,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -3206,8 +3093,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3206,8 +3093,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
...@@ -3219,8 +3106,8 @@ static void AMT630H_GUI_Telephone() ...@@ -3219,8 +3106,8 @@ static void AMT630H_GUI_Telephone()
} }
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 54, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
} }
...@@ -3247,29 +3134,68 @@ static void AMT630H_GUI_PhoneConnect_Telephone() ...@@ -3247,29 +3134,68 @@ static void AMT630H_GUI_PhoneConnect_Telephone()
{ if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) { if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0451_751_555); SetPagePic(GRAPHICS_PAGE_0, Pic_0451_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking) else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
{ {
//SetPagePic(GRAPHICS_PAGE_0, Pic_0943_751_555); SetPagePic(GRAPHICS_PAGE_0, Pic_0943_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0450_751_555); SetPagePic(GRAPHICS_PAGE_0, Pic_0450_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01) if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{ {
PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40); PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4009, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
}
}
else
{
;
}
}
/*
*NAME : AMT630H_GUI_Fuel
*FUNCTION : 燃油显示函数
*PARAMETER : uint8_t Fuel- 燃油格数
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_UPtele()
{
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{ if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)||(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)||(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0519_648_5);
SetPagePic(GRAPHICS_PAGE_0, Pic_0520_760_50);
} }
else
{
;
} }
} }
else else
...@@ -3296,7 +3222,7 @@ static void AMT630H_GUI_Fuel(uint8_t Fuel) ...@@ -3296,7 +3222,7 @@ static void AMT630H_GUI_Fuel(uint8_t Fuel)
FuelLevel = Fuel; FuelLevel = Fuel;
if(Fuel == 0) if(Fuel == 0)
{ {
FuelLevel = 1; FuelLevel = 1; /*格数统一*/
} }
else else
{ {
...@@ -3366,6 +3292,11 @@ static void AMT630H_GUI_Fuel(uint8_t Fuel) ...@@ -3366,6 +3292,11 @@ static void AMT630H_GUI_Fuel(uint8_t Fuel)
} }
} }
else
{
;
}
/*燃油格数走格*/ /*燃油格数走格*/
if (FuelLevel > 0) if (FuelLevel > 0)
{ {
...@@ -3402,6 +3333,14 @@ static void AMT630H_GUI_Fuel(uint8_t Fuel) ...@@ -3402,6 +3333,14 @@ static void AMT630H_GUI_Fuel(uint8_t Fuel)
{ {
; ;
} }
if (g_u16_GUI_PerFuelLevel == 1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0562_315_473);
}
else
{
;
}
} }
uint16_t g_u16PerFuel_SelfCheck = 1; uint16_t g_u16PerFuel_SelfCheck = 1;
...@@ -3508,7 +3447,7 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel) ...@@ -3508,7 +3447,7 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
s_FuelLowTime++; s_FuelLowTime++;
if (s_FuelLowTime <= 15) if (s_FuelLowTime <= 15)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0552_503_529); /*黄色燃油灯*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0423_26_529); /*黄色燃油灯*/
} }
if (s_FuelLowTime > 20) if (s_FuelLowTime > 20)
{ {
...@@ -3517,10 +3456,11 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel) ...@@ -3517,10 +3456,11 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0551_503_529); /*黑色燃油灯*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0424_26_529); /*黑色燃油灯*/
s_FuelLowTime = 0; s_FuelLowTime = 0;
} }
/*燃油格数走格*/ /*燃油格数走格*/
if (FuelLevel > 0) if (FuelLevel > 0)
{ {
...@@ -3555,7 +3495,15 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel) ...@@ -3555,7 +3495,15 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
} }
else else
{ {
//SetPagePic(GRAPHICS_PAGE_0, Pic_0414_76_536); /*燃油红区*/ ;
}
if(g_u16_GUI_PerFuelLevel == 1) /*当变化到1格时 显示为红区*/
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0414_76_536);
}
else
{
;
} }
} }
...@@ -4140,7 +4088,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed) ...@@ -4140,7 +4088,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber);
} }
else if ((10 <= VSpeedNumber)) else if ((10 <= VSpeedNumber) && ( VSpeedNumber < 100))
{ {
DisplayNumPara.x = 515; DisplayNumPara.x = 515;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 118; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 118;
...@@ -4150,7 +4098,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed) ...@@ -4150,7 +4098,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber);
} }
else if (0 <= VSpeedNumber) else if ((0 <= VSpeedNumber) && ( VSpeedNumber < 10))
{ {
if (VSpeedNumber == 1) if (VSpeedNumber == 1)
{ {
...@@ -4278,7 +4226,7 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed) ...@@ -4278,7 +4226,7 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber);
} }
else if ((10 <= VSpeedNumber)) else if ((10 <= VSpeedNumber) && (VSpeedNumber < 100))
{ {
DisplayNumPara.x = 514; DisplayNumPara.x = 514;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 60; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 60;
...@@ -4288,7 +4236,7 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed) ...@@ -4288,7 +4236,7 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, VSpeedNumber);
} }
else if (0 <= VSpeedNumber) else if ((0 <= VSpeedNumber) && ( VSpeedNumber < 10))
{ {
if (VSpeedNumber == 1) if (VSpeedNumber == 1)
{ {
...@@ -4937,11 +4885,22 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4937,11 +4885,22 @@ void AMT630H_GUI_ReadPosittion_Display(void)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0941_0_470); /*下半屏*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0941_0_470); /*下半屏*/
PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj); PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
AMT630H_GUI_PhoneConnect_UPtele();
} }
SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313); SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/ // SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/
AMT630H_GUI_PhoneConnect_Light(); AMT630H_GUI_PhoneConnect_Light();
AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time()); AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
if(VechileSpeed_time < 4)
{
// VechileSpeed_time++;
}
else
{
VechileSpeed_time = 0;
VechileSpeed = Get_DispVechileSpeed() / 10;
}
AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed); AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed);
AMT630H_GUI_PhoneConnect_ESpeed(Get_DispEngineSpeed()); AMT630H_GUI_PhoneConnect_ESpeed(Get_DispEngineSpeed());
AMT630H_GUI_PhoneConnect_Fuel(Get_CurFuelSetp()); AMT630H_GUI_PhoneConnect_Fuel(Get_CurFuelSetp());
......
Firmware/Source/Component/AMT630H/PicBin.h
View file @ c12bd090
#ifndef PICBIN_H #ifndef PICBIN_H
#define PICBIN_H #define PICBIN_H
/* Flash Bin Version:20240915 2024-09-15 09:22:36 Compression ratio:70.00% */ /* Flash Bin Version:20240924 2024-09-24 11:37:38 Compression ratio:70.00% */
#define Pic_0001 1 #define Pic_0001 1
#define Pic_0002 2 #define Pic_0002 2
#define Pic_0003 3 #define Pic_0003 3
...@@ -2135,6 +2135,7 @@ enum { ...@@ -2135,6 +2135,7 @@ enum {
Pic_0943_751_555, Pic_0943_751_555,
}; };
#define PIC_INDEX_DATA_CRC 0x8509F1BE #define PIC_INDEX_DATA_CRC 0x8509F1BE
extern void User_PicIndexDataInit(void); extern void User_PicIndexDataInit(void);
......
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