Skip to content

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

Merge branch 'wangyanan' into 'dev' 

Wangyanan

See merge request !90
parents 966bf86e 5b8297c4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 264 deletions
Firmware/Source/Application/BlueTooth.c
View file @ f3eabac8
...@@ -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;
......
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