Skip to content

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

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

parents 93f0c3b0 aa057fca
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 28 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 83ba2be4
...@@ -2221,6 +2221,10 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec ...@@ -2221,6 +2221,10 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
} }
/*同步联系人数字显示*/ /*同步联系人数字显示*/
if (connect_personnumber >5000)
{
connect_personnumber =5000;
}
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
if((connect_personnumber >= 0)&&(connect_personnumber < 10)) if((connect_personnumber >= 0)&&(connect_personnumber < 10))
...@@ -2235,12 +2239,22 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec ...@@ -2235,12 +2239,22 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
DisplayNumPara.x = 612; DisplayNumPara.x = 612;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
} }
// else if(Contect_totalnumber == 3) else if((connect_personnumber >= 100)&&(connect_personnumber < 1000))
// { {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_1150_576_287); /*【括号】 三位数 */ /* 同步联系人最大位数未确定*/
// DisplayNumPara.x = 619;
// } DisplayNumPara.MinDigits = 3;
}
else if((connect_personnumber >= 1000)&&(connect_personnumber < 10000))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_1151_569_287); /*【括号】 四位数 */ /* 同步联系人最大位数未确定*/
DisplayNumPara.x = 626;
DisplayNumPara.MinDigits = 4;
}
else
{
;
}
DisplayNumPara.NumList = Bluetooth_num_day; DisplayNumPara.NumList = Bluetooth_num_day;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
...@@ -2262,16 +2276,22 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec ...@@ -2262,16 +2276,22 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
DisplayNumPara.x = 612; DisplayNumPara.x = 612;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
} }
else if((connect_personnumber >= 100)&&(connect_personnumber < 1000))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_1152_576_287); /*【括号】 三位数 */ /* 同步联系人最大位数未确定*/
DisplayNumPara.x = 619;
DisplayNumPara.MinDigits = 3;
}
else if((connect_personnumber >= 1000)&&(connect_personnumber < 10000))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_1153_569_287); /*【括号】 四位数 */ /* 同步联系人最大位数未确定*/
DisplayNumPara.x = 626;
DisplayNumPara.MinDigits = 4;
}
else else
{ {
; ;
} }
// else if(Contect_totalnumber == 3)
// {
// SetPagePic(GRAPHICS_PAGE_0, ); /*【括号】 三位数 */
//
// }
DisplayNumPara.NumList = Bluetooth_num_night; DisplayNumPara.NumList = Bluetooth_num_night;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14; DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
...@@ -3061,7 +3081,7 @@ static void AMT630H_GUI_PhoneConnect_Light() ...@@ -3061,7 +3081,7 @@ static void AMT630H_GUI_PhoneConnect_Light()
// { // {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0466_874_488); // SetPagePic(GRAPHICS_PAGE_0, Pic_0466_874_488);
// } // }
if(Get_TelltalesLedSts(em_LED_TCS)) if(Get_TelltalesLedSts(em_LED_TCS) == 1)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0473_172_490); SetPagePic(GRAPHICS_PAGE_0, Pic_0473_172_490);
} }
......
Firmware/Source/Component/Key/Key_user.c
View file @ 83ba2be4
...@@ -330,7 +330,8 @@ void Key_Event_Short_Press_Right(void)//确认 ...@@ -330,7 +330,8 @@ void Key_Event_Short_Press_Right(void)//确认
{ {
PackedTransfer_BlueTooth_DataSet(Phone_Hangup_Out); PackedTransfer_BlueTooth_DataSet(Phone_Hangup_Out);
} }
else if(Get_ActualVechileSpeed() == 0) else if((Menu_Get_Current_Cursor_Information() == MENU_ITEM_PHONE_CONNECT_APP)||
((Menu_Get_Current_Cursor_Information() == MENU_ITEM_MAIN_ITEM) && (Get_ActualVechileSpeed() == 0)))
{ {
Menu_Service(MENU_KEY_CONFIRM_SHORT); Menu_Service(MENU_KEY_CONFIRM_SHORT);
} }
......
Firmware/Source/UDS/UDS_ISO14229_Services.c
View file @ 83ba2be4
...@@ -83,19 +83,19 @@ uint8_t MCU_PartNumber[20] = {'3', '7', '1', '0', '0', '0', '-', '7', '5', '0', ...@@ -83,19 +83,19 @@ uint8_t MCU_PartNumber[20] = {'3', '7', '1', '0', '0', '0', '-', '7', '5', '0',
/* internal program info */ /* internal program info */
const uint8_t DID_1024[13] = const uint8_t DID_1024[13] =
{ {
((internal_version / 100UL) + 0x30UL), (uint8_t)((internal_version / 100UL) + 0x30UL),
'.', '.',
(((internal_version / 10UL) % 10UL) + 0x30UL), (uint8_t)(((internal_version / 10UL) % 10UL) + 0x30UL),
((internal_version % 10UL) + 0x30UL), (uint8_t)((internal_version % 10UL) + 0x30UL),
'_', '_',
((internal_date / 10000000UL) + 0x30), (uint8_t)((internal_date / 10000000UL) + 0x30),
(((internal_date / 1000000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 1000000UL) % 10UL) + 0x30),
(((internal_date / 100000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 100000UL) % 10UL) + 0x30),
(((internal_date / 10000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 10000UL) % 10UL) + 0x30),
(((internal_date / 1000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 1000UL) % 10UL) + 0x30),
(((internal_date / 100UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 100UL) % 10UL) + 0x30),
(((internal_date / 10UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 10UL) % 10UL) + 0x30),
((internal_date % 10UL) + 0x30) (uint8_t)((internal_date % 10UL) + 0x30)
}; };
/*写App有效性标志*/ /*写App有效性标志*/
...@@ -134,7 +134,7 @@ void S3_ServerCNTT(void) ...@@ -134,7 +134,7 @@ void S3_ServerCNTT(void)
if(Service27_DelayTimer >= 100U) if(Service27_DelayTimer >= 100U)
{ {
Service27_DelayTimer_Enable = 0U; Service27_DelayTimer_Enable = 0U;
Attemptcnt -= AttemptMaxCnt - 1U; Attemptcnt = (uint8_t)(AttemptMaxCnt - 1U);
Service27_DelayTimer = 0U; Service27_DelayTimer = 0U;
} }
else else
...@@ -680,12 +680,12 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A ...@@ -680,12 +680,12 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
case 0x5000U: // 读UUID case 0x5000U: // 读UUID
(void)memcpy(&UDS_ISO14229_Transfer[2], Diag_Write_Data.DID_5000, sizeof(Diag_Write_Data.DID_5000)); (void)memcpy(&UDS_ISO14229_Transfer[2], Diag_Write_Data.DID_5000, sizeof(Diag_Write_Data.DID_5000));
UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + sizeof(Diag_Write_Data.DID_5000), UDS_ISO14229_Transfer); UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, (uint16_t)(2 + sizeof(Diag_Write_Data.DID_5000)), UDS_ISO14229_Transfer);
break; break;
case 0x1024: // 读内部版本号 case 0x1024: // 读内部版本号
(void)memcpy(&UDS_ISO14229_Transfer[2], DID_1024, sizeof(DID_1024)); (void)memcpy(&UDS_ISO14229_Transfer[2], DID_1024, sizeof(DID_1024));
UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + sizeof(DID_1024), UDS_ISO14229_Transfer); UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, (uint16_t)(2 + sizeof(DID_1024)), UDS_ISO14229_Transfer);
break; break;
// case 0x2024: // ESP32内部版本号 // case 0x2024: // ESP32内部版本号
......
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