Skip to content

H
haoJin750TFT
Commit 352532d1 authored by 李延凯's avatar 李延凯
Browse files
Options

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

parents 8c2820a2 8ba7c58d
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 88 deletions
Firmware/Source/Application/BlueTooth.c
View file @ 352532d1
...@@ -13,6 +13,7 @@ _QRCODE_RECT QRCode_Rect; ...@@ -13,6 +13,7 @@ _QRCODE_RECT QRCode_Rect;
const uint8_t HJBlueToothName[9]= {"HJ750"}; const uint8_t HJBlueToothName[9]= {"HJ750"};
uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00}; uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
//"600032023120100000995" //"600032023120100000995"
uint8_t SetBluetoothCloseCount = 0;
uint8_t OSVersionASCLLList[20] = uint8_t OSVersionASCLLList[20] =
{ {
0x56,0x00, 0x56,0x00,
...@@ -47,98 +48,97 @@ void TextService(void); ...@@ -47,98 +48,97 @@ void TextService(void);
void BlueToothService(void) void BlueToothService(void)
{ {
// SetUUIDTimes++; if(SYS_OPR_STAT_IGN_ON)
if(Get_Dis_Bluetooth_Open_Close() == 0)
{ {
if(GetBlueToothVaild == 0) if(Get_Dis_Bluetooth_Open_Close() == 0)
{ {
SetBluetoothTurnXX(1); if(GetBlueToothVaild == 0)
GetBlueToothVaild = 1; {
SetBluetoothTurnXX(1);
GetBlueToothVaild = 1;
}
} }
} else
else
{
if(GetBlueToothVaild == 1)
{ {
SetBluetoothTurnXX(0); if(GetBlueToothVaild == 1)
GetBlueToothVaild = 0; {
if(SetBluetoothCloseCount < 30)
{
SetBluetoothTurnXX(0);
}
else
{
GetBlueToothVaild = 0;
SetBluetoothCloseCount = 0;
}
SetBluetoothCloseCount++;
}
} }
}
if ((BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)&&(GetPhoneBookVaild == 0)) if ((BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)&&(GetPhoneBookVaild == 0))
{ {
PackedTransfer_GetPhoneBookCmd(); PackedTransfer_GetPhoneBookCmd();
GetPhoneBookVaild = 1; GetPhoneBookVaild = 1;
} }
else if (BlueToothPhoneData.BlueToothSignalSate == BlueTooth_DisConnect) else if (BlueToothPhoneData.BlueToothSignalSate == BlueTooth_DisConnect)
{ {
GetPhoneBookVaild = 0; GetPhoneBookVaild = 0;
} }
if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)) if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking))
{
Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
}
SetUUIDData((char *)UUIDConfigBuf, 22);
if (OTA_Update_Flag == 1)
{
QRCode_Rect.x = 650;
QRCode_Rect.y = 210;
}
else
{
QRCode_Rect.x = QRCode_X;
QRCode_Rect.y = QRCode_Y;
}
// QRCode_Rect.x = 650;
// QRCode_Rect.y = 210;
QRCode_Rect.height = 240;
QRCode_Rect.width = 240;
SetScreenType(QRCode_TYPE, QRCode_Rect);
if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
{
OTA_Update_Flag = 0;
}
if(OTA_Update_Flag == 1)
{
if(OTA_Update_Count_Open < 5)
{ {
SetUpdateCtrl(1,QRCode_Rect); Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
OTA_Update_Count_Open++; }
} SetUUIDData((char *)UUIDConfigBuf, 22);
OTA_Update_Count_Close = 0; if (OTA_Update_Flag == 1)
} {
QRCode_Rect.x = 650;
QRCode_Rect.y = 210;
}
else
{
QRCode_Rect.x = QRCode_X;
QRCode_Rect.y = QRCode_Y;
}
// QRCode_Rect.x = 650;
// QRCode_Rect.y = 210;
QRCode_Rect.height = 240;
QRCode_Rect.width = 240;
SetScreenType(QRCode_TYPE, QRCode_Rect);
// if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
// {
// OTA_Update_Flag = 0;
// }
if(OTA_Update_Flag == 1)
{
if(OTA_Update_Count_Open < 5)
{
SetUpdateCtrl(1,QRCode_Rect);
OTA_Update_Count_Open++;
}
OTA_Update_Count_Close = 0;
}
else
{
if(OTA_Update_Count_Close < 5)
{
SetUpdateCtrl(0,QRCode_Rect);
OTA_Update_Count_Close++;
}
OTA_Update_Count_Open=0;
}
SetTaskbarHeight(150);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService();
}
else else
{ {
if(OTA_Update_Count_Close < 5) GetBlueToothVaild =0;
{ OTA_Update_Flag = 0;
SetUpdateCtrl(0,QRCode_Rect); SetBluetoothTurnXX(0);
OTA_Update_Count_Close++; SetUpdateCtrl(0,QRCode_Rect);
}
OTA_Update_Count_Open=0;
} }
SetTaskbarHeight(150);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService();
// BlueConnectStatus = GetBlueToothPowerSTATE();
// juasfha = BlueToothPhoneData.BlueToothPhoneSate;
// juasfha = BlueToothPhoneData.PhoneBookTotalCount;
// for(i=0;i<20;i++)
// {
// sjhja[i] = BlueToothPhoneData.PhoneNumber[i];
// }
// for(i=0;i<100;i++)
// {
// PhoneName[i] = BlueToothPhoneData.BlueToothPhoneName[i];
// }
// _QRCODE_RECT QRCode_Rect;
// QRCode_Rect.x = QRCode_X;
// QRCode_Rect.y = QRCode_Y;
// QRCode_Rect.height = QRCode_HEIGHT;
// QRCode_Rect.width = QRCode_WIDTH;
// SetScreenType(QRCode_TYPE, QRCode_Rect);
} }
TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] = TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] =
......
Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c
View file @ 352532d1
...@@ -45,7 +45,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] = ...@@ -45,7 +45,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}, {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, 1000ul,
0x402ul, 0x402ul,
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
......
Firmware/Source/Component/Key/Key_user.c
View file @ 352532d1
...@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void) ...@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void)
{ {
if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_FAULT_INFORMATION) if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_FAULT_INFORMATION)
{ {
OTA_Update_Flag = ! OTA_Update_Flag; OTA_Update_Flag = 1U;
} }
} }
void KEY_LEFT_EVENT_NONE_Service(void) void KEY_LEFT_EVENT_NONE_Service(void)
...@@ -387,13 +387,13 @@ void Get_DisTime_Service(void) ...@@ -387,13 +387,13 @@ void Get_DisTime_Service(void)
void My_Key_Service(void) void My_Key_Service(void)
{ {
/* 自检时不可操作按键 */ /* 自检和OTA界面时不可操作按键 */
if(g_u8SelfCheck) if((g_u8SelfCheck) && (OTA_Update_Flag == 0))
{ {
if((Get_ActualVechileSpeed() == 0) ||((Get_DispVechileSpeed() >= 1990) && (Get_DispEngineSpeed() >= 12000))) if((Get_ActualVechileSpeed() == 0) ||((Get_DispVechileSpeed() >= 1990) && (Get_DispEngineSpeed() >= 12000)))
{ {
Key_Service(); Key_Service();
} }
} }
} }
......
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @ 352532d1
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
/****************************************************************************** /******************************************************************************
program version program version
*******************************************************************************/ *******************************************************************************/
#define SWV 0x105 // 0x100 = 1.00 software version 软件版本号 #define SWV 0x106 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x110 // 0x100 = 1.00 hardware version 硬件版本号 #define HWV 0x110 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x104 // 0x100 = 1.00 bootloader version boot程序版本号 #define BTV 0x104 // 0x100 = 1.00 bootloader version boot程序版本号
#define internal_version (105UL) /* 内部版本号 105 -> 1.05 */ #define internal_version (106UL) /* 内部版本号 105 -> 1.05 */
#define internal_date (20240805UL) /* 内部版本日期 20240805 -> 2024.08.05 */ #define internal_date (20240915UL) /* 内部版本日期 20240805 -> 2024.08.05 */
/** /**
*DFlash *DFlash
......
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